ostree.git
13 years agoSome corrections in gnomeos/README-build.md
Adrian Perez [Sun, 22 Apr 2012 22:55:14 +0000 (01:55 +0300)]
Some corrections in gnomeos/README-build.md

13 years agocore: Add ability for repositories to have a "parent"
Colin Walters [Tue, 17 Apr 2012 01:21:50 +0000 (21:21 -0400)]
core: Add ability for repositories to have a "parent"

This will be useful for ostbuild; a user can create their own archive
mode repository which transparently inherits objects from the
root-owned one in /ostree.

13 years agoREADME.md: Note existence of wiki page
Colin Walters [Thu, 19 Apr 2012 00:36:16 +0000 (20:36 -0400)]
README.md: Note existence of wiki page

13 years agoswitchroot: Properly check for number of arguments
Adrian Perez [Wed, 18 Apr 2012 18:13:43 +0000 (21:13 +0300)]
switchroot: Properly check for number of arguments

The ostree-switch-root tool expects three arguments (argc=4): new root, OS
tree target, and init(8) binary to launch inside it. Also, the error message
when not enough arguments are passed now tells about the second argument
being the target OS tree.

Reviewed-by: Colin Walters <walters@verbum.org>
13 years agognomeos-install.sh: retrieve full path to srcdir
Carl-Anton Ingmarsson [Tue, 17 Apr 2012 20:01:49 +0000 (22:01 +0200)]
gnomeos-install.sh: retrieve full path to srcdir

This fixes the installation of the grub2 script.

13 years agocore: Pull pack files individually
Colin Walters [Mon, 16 Apr 2012 21:14:43 +0000 (17:14 -0400)]
core: Pull pack files individually

13 years agocore: Cache pack indexes
Colin Walters [Mon, 16 Apr 2012 21:13:54 +0000 (17:13 -0400)]
core: Cache pack indexes

This is a 10x speedup on heavy users of ostree_repo_find_object(),
such as ostree-pull.

13 years agotriggers: Test for gconftool-2
Colin Walters [Fri, 13 Apr 2012 20:11:03 +0000 (16:11 -0400)]
triggers: Test for gconftool-2

This was done for the rest of the triggers.

13 years agoostbuild: Take advantage of link cache
Colin Walters [Fri, 13 Apr 2012 20:10:40 +0000 (16:10 -0400)]
ostbuild: Take advantage of link cache

This greatly speeds up construction of buildroots.

13 years agognomeos: Update to NSS 3.13.4
Colin Walters [Fri, 13 Apr 2012 18:32:25 +0000 (14:32 -0400)]
gnomeos: Update to NSS 3.13.4

In particular we no longer need the stupid Linux3.0.mk Linux3.1.mk
Linux3.2.mk files.

13 years agocore: Add --link-cache option to checkout
Colin Walters [Fri, 13 Apr 2012 12:32:02 +0000 (08:32 -0400)]
core: Add --link-cache option to checkout

This is a convenient way to have a lookaside directory of hard links,
which can greatly speed up checkouts.  In the future we probably want
to push this down into the repository.

13 years agoRelease 2012.2
Colin Walters [Thu, 12 Apr 2012 02:47:48 +0000 (22:47 -0400)]
Release 2012.2

13 years agocore: Re-unify on one OSTREE_OBJECT_TYPE_FILE
Colin Walters [Wed, 11 Apr 2012 19:18:34 +0000 (15:18 -0400)]
core: Re-unify on one OSTREE_OBJECT_TYPE_FILE

Having the archived vs not distinction in the object system wasn't
useful in light of pack files.  In fact, we should probably move
towards generating a pack file per commit by default.

13 years agocore: Clean up checksumming
Colin Walters [Tue, 10 Apr 2012 20:40:22 +0000 (16:40 -0400)]
core: Clean up checksumming

Don't expose GChecksum in APIs.  Add a new stream class which allows
us to pass an input stream somewhere, but gather a checksum as it's
read.

Move some bits of the internals towards binary csums.

13 years agocore: Drop wrapping of metadata variants
Colin Walters [Tue, 10 Apr 2012 12:30:51 +0000 (08:30 -0400)]
core: Drop wrapping of metadata variants

13 years agocore: Split pack files into data/metadata
Colin Walters [Tue, 10 Apr 2012 02:46:08 +0000 (22:46 -0400)]
core: Split pack files into data/metadata

This will allow us to download metadata first (separately), and in the
future we can have an improved metadata pack format that compresses
heavily.

13 years agocore: Switch to 'ay' for checksums, drop versions/metadata
Colin Walters [Mon, 9 Apr 2012 21:36:41 +0000 (17:36 -0400)]
core: Switch to 'ay' for checksums, drop versions/metadata

13 years agocore: Drop 'compose' builtin
Colin Walters [Mon, 9 Apr 2012 21:39:11 +0000 (17:39 -0400)]
core: Drop 'compose' builtin

We'll just add this functionality to commit.

13 years agocore: Clean up checksum API
Colin Walters [Mon, 9 Apr 2012 20:31:46 +0000 (16:31 -0400)]
core: Clean up checksum API

We want to move towards guchar * for binary checksums.

13 years agocore: unpack: Regenerate pack index after unpacking
Colin Walters [Wed, 11 Apr 2012 23:53:10 +0000 (19:53 -0400)]
core: unpack: Regenerate pack index after unpacking

13 years agocore: Fix uninitialized variables
Colin Walters [Wed, 11 Apr 2012 23:52:57 +0000 (19:52 -0400)]
core: Fix uninitialized variables

13 years agotests: Actually test pack functionality
Colin Walters [Wed, 11 Apr 2012 23:48:22 +0000 (19:48 -0400)]
tests: Actually test pack functionality

With --keep-loose we were just using the loose objects.

13 years agocore: Port builtins to local alloc macros
Colin Walters [Mon, 9 Apr 2012 19:03:53 +0000 (15:03 -0400)]
core: Port builtins to local alloc macros

13 years agocore: Port libostree to local alloc
Colin Walters [Mon, 9 Apr 2012 19:45:20 +0000 (15:45 -0400)]
core: Port libostree to local alloc

13 years agocore: Port libotutil to local-alloc
Colin Walters [Mon, 9 Apr 2012 19:48:20 +0000 (15:48 -0400)]
core: Port libotutil to local-alloc

13 years agocore: Add macros for local allocation
Colin Walters [Mon, 9 Apr 2012 18:04:02 +0000 (14:04 -0400)]
core: Add macros for local allocation

This is GCC-specific, but it makes the code significantly
cleaner.

13 years agocore: Fix xattr API to conform to coding style
Colin Walters [Mon, 9 Apr 2012 19:09:27 +0000 (15:09 -0400)]
core: Fix xattr API to conform to coding style

13 years agocore: Fix a minor memory leak
Colin Walters [Mon, 9 Apr 2012 18:18:00 +0000 (14:18 -0400)]
core: Fix a minor memory leak

14 years agocore: pull: Add progress bar, allow pulling individual commits
Colin Walters [Sun, 8 Apr 2012 20:50:53 +0000 (16:50 -0400)]
core: pull: Add progress bar, allow pulling individual commits

14 years agocore: checkout: Add --from-stdin option
Colin Walters [Fri, 6 Apr 2012 19:11:11 +0000 (15:11 -0400)]
core: checkout: Add --from-stdin option

This allows checking out many branches in one go, useful in
combination with the --union flag for ostbuild to combine a lot of
components.

14 years agols: Add mode to print filenames as binary
Colin Walters [Fri, 6 Apr 2012 19:10:20 +0000 (15:10 -0400)]
ls: Add mode to print filenames as binary

This is useful to extract the file listing to another program.

14 years agognomeos-install.sh: Fix link to -devel root
Colin Walters [Fri, 6 Apr 2012 01:53:25 +0000 (21:53 -0400)]
gnomeos-install.sh: Fix link to -devel root

Now that we're using checkout --atomic-swap, there is no
-devel-current.

14 years ago15_ostree: don't assume kernel arch names
Diego Escalante Urrelo [Fri, 6 Apr 2012 01:43:55 +0000 (20:43 -0500)]
15_ostree: don't assume kernel arch names

uname -m is not always the suffix of the kernel image. Debian uses
-686-pae, but uname -m would say i686. This creates an infinite loop in
Debian.

14 years agognomeos-clone-qemu: use bash explicitely
Diego Escalante Urrelo [Fri, 6 Apr 2012 01:43:09 +0000 (20:43 -0500)]
gnomeos-clone-qemu: use bash explicitely

14 years agoostree-pull: GOptionEntry must be NULL terminated
Diego Escalante Urrelo [Thu, 5 Apr 2012 05:56:29 +0000 (00:56 -0500)]
ostree-pull: GOptionEntry must be NULL terminated

14 years agognomeos-install: don't cd into /ostree prematurely
Diego Escalante Urrelo [Thu, 5 Apr 2012 05:30:20 +0000 (00:30 -0500)]
gnomeos-install: don't cd into /ostree prematurely

The script will die and not proceed with the creation of the directory.

14 years agognomeos-install: use /bin/bash, not /bin/sh
Diego Escalante Urrelo [Thu, 5 Apr 2012 05:29:55 +0000 (00:29 -0500)]
gnomeos-install: use /bin/bash, not /bin/sh

This scripts use bashisms, so use /bin/bash as the interpreter until
they are un-bashified.

14 years agognomeos: update README script path
Diego Escalante Urrelo [Thu, 5 Apr 2012 05:29:25 +0000 (00:29 -0500)]
gnomeos: update README script path

14 years agocore: Associate branches with remotes, move trigger runs into checkout
Colin Walters [Wed, 4 Apr 2012 03:45:48 +0000 (23:45 -0400)]
core: Associate branches with remotes, move trigger runs into checkout

Also add --atomic-retarget option to checkout. This does the magical
symlink dance to do atomic swaps between trees.

14 years agocore: Clean up stale packfiles
Colin Walters [Wed, 4 Apr 2012 03:45:28 +0000 (23:45 -0400)]
core: Clean up stale packfiles

14 years agocore: Validate structure of objects in fsck
Colin Walters [Tue, 3 Apr 2012 12:52:58 +0000 (08:52 -0400)]
core: Validate structure of objects in fsck

14 years agocore: Make pull slightly more verbose
Colin Walters [Tue, 3 Apr 2012 12:52:44 +0000 (08:52 -0400)]
core: Make pull slightly more verbose

14 years agocore: Drop "staged" state for objects, refactor pull to split metadata/data
Colin Walters [Mon, 2 Apr 2012 23:52:22 +0000 (19:52 -0400)]
core: Drop "staged" state for objects, refactor pull to split metadata/data

Previously we had the "staged" state to ensure we didn't add a commit
object without the associated dirtree, etc.  However it's
easier/better to just ensure in the pull command that we have all
referenced objects.

Also change pull to download metadata first.  This will allow adding
a progress bar later.

14 years agocore: Make fsck verify from commit objects
Colin Walters [Mon, 2 Apr 2012 22:18:11 +0000 (18:18 -0400)]
core: Make fsck verify from commit objects

Rather than verifying every object, traverse all commit objects we
find.  This is a better check, since primarily we care about being
able to check out trees.  In the new packfile regime, this ensures
validity of packed data.

It also means we aren't checking loose objects that we most likely
don't care about.

14 years agocore: Move commit/dirtree traversal into library
Colin Walters [Mon, 2 Apr 2012 19:51:23 +0000 (15:51 -0400)]
core: Move commit/dirtree traversal into library

So it can more easily be reused by other builtins.

14 years agocore: Fix a few memory leaks
Colin Walters [Mon, 2 Apr 2012 21:41:04 +0000 (17:41 -0400)]
core: Fix a few memory leaks

14 years agocore: Return input stream for raw repositories too
Colin Walters [Mon, 2 Apr 2012 21:40:17 +0000 (17:40 -0400)]
core: Return input stream for raw repositories too

This bug is more obvious when fsck is rebased on top of
ostree_repo_load_file().

14 years agoRelease 2012.1
Colin Walters [Mon, 2 Apr 2012 17:49:23 +0000 (13:49 -0400)]
Release 2012.1

14 years agocore: Only depend on GLib 2.30
Colin Walters [Mon, 2 Apr 2012 17:42:09 +0000 (13:42 -0400)]
core: Only depend on GLib 2.30

14 years agoRelease 2012.0
Colin Walters [Sat, 31 Mar 2012 16:34:11 +0000 (12:34 -0400)]
Release 2012.0

This marks a new versioning scheme.

14 years agocore: Add pack files
Colin Walters [Sat, 31 Mar 2012 14:37:51 +0000 (10:37 -0400)]
core: Add pack files

This concept is also directly inspired by git.  At present, our
implementation is quite similar, except we don't have delta
compression.

14 years agocore: Add stream->variant helper, as well as clear macros for ptrarray/hashtable
Colin Walters [Sat, 31 Mar 2012 14:32:26 +0000 (10:32 -0400)]
core: Add stream->variant helper, as well as clear macros for ptrarray/hashtable

14 years agocore: Add a few more GIO utility functions
Colin Walters [Sat, 31 Mar 2012 14:32:02 +0000 (10:32 -0400)]
core: Add a few more GIO utility functions

14 years agocore: Add helper functions to convert (checksum, objtype) pair to/from string
Colin Walters [Wed, 14 Mar 2012 13:37:00 +0000 (09:37 -0400)]
core: Add helper functions to convert (checksum, objtype) pair to/from string

14 years agoostbuild: Add preserve_net config option
Colin Walters [Tue, 13 Mar 2012 21:06:06 +0000 (17:06 -0400)]
ostbuild: Add preserve_net config option

This is going to be necessary for the builder.

14 years agomanifest: Move ostree back to master branch from git
Colin Walters [Tue, 13 Mar 2012 17:09:05 +0000 (13:09 -0400)]
manifest: Move ostree back to master branch from git

14 years agognomeos: Move gnomeos/yocto into poky tree
Colin Walters [Tue, 13 Mar 2012 15:57:14 +0000 (11:57 -0400)]
gnomeos: Move gnomeos/yocto into poky tree

Now lives here: https://github.com/cgwalters/poky

14 years agoostbuild: Re-unify into one snapshot.json file
Colin Walters [Tue, 13 Mar 2012 14:13:22 +0000 (10:13 -0400)]
ostbuild: Re-unify into one snapshot.json file

This is actually easier.  Now add 'ostbuild query-content' which can
extract the JSON data we stuff into builds.

14 years agoostbuild: Rename manifest for clarity
Colin Walters [Mon, 12 Mar 2012 00:17:15 +0000 (20:17 -0400)]
ostbuild: Rename manifest for clarity

14 years agoostbuild: Rework again, split into components.json and targets.json
Colin Walters [Sun, 11 Mar 2012 00:27:27 +0000 (19:27 -0500)]
ostbuild: Rework again, split into components.json and targets.json

The "resolve" builtin now does a lot more heavy lifting; we expand the
manifest.json, and "build" consequently is less intelligent now, more
of a low-level implementation.

14 years agomanifest: Drop duplicated components (oops!)
Colin Walters [Thu, 8 Mar 2012 21:24:19 +0000 (16:24 -0500)]
manifest: Drop duplicated components (oops!)

14 years agoostbuild: Only check out source if we need to
Colin Walters [Thu, 8 Mar 2012 14:02:46 +0000 (09:02 -0500)]
ostbuild: Only check out source if we need to

When using --skip-built, we shouldn't do a checkout if we're not going
to build.

14 years agoostbuild: Ensure we enable soup-gnome for ostree
Colin Walters [Thu, 8 Mar 2012 13:41:58 +0000 (08:41 -0500)]
ostbuild: Ensure we enable soup-gnome for ostree

14 years agoostbuild: Stop generating git mirror config
Colin Walters [Thu, 8 Mar 2012 13:41:32 +0000 (08:41 -0500)]
ostbuild: Stop generating git mirror config

Nothing's using it right now and it's a little buggy.

14 years agoostbuild: Further work on regenerating a snapshot from a compose
Colin Walters [Thu, 8 Mar 2012 00:58:07 +0000 (19:58 -0500)]
ostbuild: Further work on regenerating a snapshot from a compose

14 years agoostbuild: Change to name-prefix and base-prefix in manifest
Colin Walters [Wed, 7 Mar 2012 17:06:44 +0000 (12:06 -0500)]
ostbuild: Change to name-prefix and base-prefix in manifest

This makes it clearer that we're using this as a prefix, when we
generate the snapshots.

14 years agoostbuild: Switch to composing via checkouts+commit
Colin Walters [Wed, 7 Mar 2012 12:15:34 +0000 (07:15 -0500)]
ostbuild: Switch to composing via checkouts+commit

Store the compose contents as a JSON file in the filesystem tree.
This is more flexible compared to defining "compose" as just a literal
layering of filesystem trees.  For example, we might want to run
prelink.

14 years agoostbuild: Stop using "compose" to make buildroots
Colin Walters [Wed, 7 Mar 2012 00:36:58 +0000 (19:36 -0500)]
ostbuild: Stop using "compose" to make buildroots

It pollutes the repository with a combinatorial explosion of .dirtree
metadata files, and we don't really need to track buildroots at that
level.

14 years agoostbuild: Drop "commit-artifacts" builtin
Colin Walters [Mon, 5 Mar 2012 15:44:01 +0000 (10:44 -0500)]
ostbuild: Drop "commit-artifacts" builtin

It's long since dead.

14 years agoostbuild: Kill "autodiscover-meta"
Colin Walters [Mon, 5 Mar 2012 15:39:49 +0000 (10:39 -0500)]
ostbuild: Kill "autodiscover-meta"

No longer needed.

14 years agoostbuild: Adapt "status" to expanded manifest
Colin Walters [Mon, 5 Mar 2012 15:33:49 +0000 (10:33 -0500)]
ostbuild: Adapt "status" to expanded manifest

14 years agoostbuild: Adapt "build" to newly updated expanded manifest
Colin Walters [Sun, 4 Mar 2012 17:59:17 +0000 (12:59 -0500)]
ostbuild: Adapt "build" to newly updated expanded manifest

14 years agoostbuild: Write out separate arch-component snapshots
Colin Walters [Fri, 2 Mar 2012 12:51:56 +0000 (07:51 -0500)]
ostbuild: Write out separate arch-component snapshots

14 years agoostbuild: 'checkout' command now also applies patches
Colin Walters [Fri, 2 Mar 2012 11:51:53 +0000 (06:51 -0500)]
ostbuild: 'checkout' command now also applies patches

14 years agoostbuild: Pull patches from specified patches git repository
Colin Walters [Tue, 28 Feb 2012 11:40:35 +0000 (06:40 -0500)]
ostbuild: Pull patches from specified patches git repository

We need to be more formal about where we get patches from, and more
specifically what version.  Let's assume they're also stored in a git
repository that we fetch, instead of copying them from "wherever the
manifest is".

This meshes nicely with splitting between manifest.json and
snapshot.json.

14 years agoostbuild: Change metadata keys for artifacts
Colin Walters [Tue, 28 Feb 2012 00:29:33 +0000 (19:29 -0500)]
ostbuild: Change metadata keys for artifacts

"ostbuild-name" is important to tie back in to the snapshot.
"ostbuild-revision" is shorter than ostbuild-artifact-version.

14 years agoostbuild: Copy snapshot JSON into artifact trees
Colin Walters [Tue, 28 Feb 2012 00:28:52 +0000 (19:28 -0500)]
ostbuild: Copy snapshot JSON into artifact trees

This is kind of a hack...but...

14 years agoostbuild: Sort keys in JSON snapshot
Colin Walters [Tue, 28 Feb 2012 00:28:13 +0000 (19:28 -0500)]
ostbuild: Sort keys in JSON snapshot

14 years agoostbuild: Rename build manifest to "snapshot.json"
Colin Walters [Mon, 27 Feb 2012 23:57:56 +0000 (18:57 -0500)]
ostbuild: Rename build manifest to "snapshot.json"

It was confusing having two manifests.  "snapshot" matches the
jhbuild term for the same thing.

14 years agoostbuild: Move more intelligence into chroot-compile-one
Colin Walters [Sat, 25 Feb 2012 02:36:24 +0000 (21:36 -0500)]
ostbuild: Move more intelligence into chroot-compile-one

Let's have chroot-compile-one be the core logic for composing a
buildroot, etc.  This allows us to use it as a developer tool by
checking out a tree, then doing a chroot build.

14 years agocore: Fix "cat" crashing when it should have returned ENOENT
Colin Walters [Wed, 7 Mar 2012 15:25:26 +0000 (10:25 -0500)]
core: Fix "cat" crashing when it should have returned ENOENT

14 years agocore: Fix crasher in "rev-parse"
Colin Walters [Thu, 8 Mar 2012 13:41:01 +0000 (08:41 -0500)]
core: Fix crasher in "rev-parse"

14 years agocore: Add --union mode to checkout
Colin Walters [Tue, 6 Mar 2012 16:37:50 +0000 (11:37 -0500)]
core: Add --union mode to checkout

This is another step towards ostbuild using this instead of the
"compose" builtin.

14 years agocore: Don't call unlink() on directory if it already exists
Colin Walters [Tue, 6 Mar 2012 16:33:42 +0000 (11:33 -0500)]
core: Don't call unlink() on directory if it already exists

If we fail to make a directory because it exists, we shouldn't call
unlink() on it.

14 years agocore: Pull diff functionality out into "diff" builtin
Colin Walters [Tue, 6 Mar 2012 14:10:48 +0000 (09:10 -0500)]
core: Pull diff functionality out into "diff" builtin

There's no good reason for this to be in core when it's only in use by
the diff builtin.

14 years agocore: Add "subpath" option to checkout
Colin Walters [Tue, 6 Mar 2012 13:57:31 +0000 (08:57 -0500)]
core: Add "subpath" option to checkout

Will be used by ostbuild to extract e.g. /runtime or /devel from
artifacts.

14 years agocore: Improve checkout API
Colin Walters [Tue, 6 Mar 2012 13:48:48 +0000 (08:48 -0500)]
core: Improve checkout API

Expose the lower-level functionality in libostree, change checkout
builtin to be a higher level driver.  This will allow us to more
easily improve the "checkout" builtin..

14 years agocore: Add ostree-types.h
Colin Walters [Tue, 6 Mar 2012 13:45:43 +0000 (08:45 -0500)]
core: Add ostree-types.h

This allows us to have circular references between the headers.

14 years agolibotuil: Fix missing #define in header
Colin Walters [Tue, 6 Mar 2012 13:44:27 +0000 (08:44 -0500)]
libotuil: Fix missing #define in header

14 years agomainloop: Don't create poll until we need to
Colin Walters [Tue, 6 Mar 2012 13:10:33 +0000 (08:10 -0500)]
mainloop: Don't create poll until we need to

This slightly optimizes the case where we speculatively create a
Mainloop we might not use.

14 years agocore: Allow 'rev-parse' to resolve multiple revs
Colin Walters [Tue, 6 Mar 2012 12:56:30 +0000 (07:56 -0500)]
core: Allow 'rev-parse' to resolve multiple revs

14 years agocore: Add 'cat' builtin
Colin Walters [Mon, 5 Mar 2012 16:32:48 +0000 (11:32 -0500)]
core: Add 'cat' builtin

14 years agocompose: Don't print trailing (null) if we skip committing
Colin Walters [Sat, 25 Feb 2012 02:35:31 +0000 (21:35 -0500)]
compose: Don't print trailing (null) if we skip committing

If we skip a commit due to an idential content parent, we shouldn't
print the (null) commit checksum.

14 years agoAdd some more draft documentation
Matthias Clasen [Wed, 29 Feb 2012 13:52:10 +0000 (08:52 -0500)]
Add some more draft documentation

This is just the bones for now, waiting for Colin to
provide the meat.

14 years agognomeos-update-branches: Don't copy kernel modules
Colin Walters [Tue, 28 Feb 2012 18:27:31 +0000 (13:27 -0500)]
gnomeos-update-branches: Don't copy kernel modules

No longer necessary now that we're storing them in /ostree/modules.

14 years agoREADME-install: Improve to use new multi-pull, etc.
Colin Walters [Tue, 28 Feb 2012 18:19:31 +0000 (13:19 -0500)]
README-install: Improve to use new multi-pull, etc.

14 years agopull: Allow pulling multiple specific refs
Colin Walters [Tue, 28 Feb 2012 18:17:03 +0000 (13:17 -0500)]
pull: Allow pulling multiple specific refs

14 years agomanifest: Drop gnome-control-center patches
Colin Walters [Tue, 28 Feb 2012 17:57:25 +0000 (12:57 -0500)]
manifest: Drop gnome-control-center patches

shaunm removed the help entirely.

14 years agoAdd some update instructions to the README
Matthias Clasen [Tue, 28 Feb 2012 17:20:40 +0000 (12:20 -0500)]
Add some update instructions to the README

Everything is complicated for somebody who looks at this
for the first time, so lets explain the basics.

14 years agoprune: Fix two crasher bugs
Colin Walters [Mon, 27 Feb 2012 14:53:44 +0000 (09:53 -0500)]
prune: Fix two crasher bugs